branchbefore/main/Smart Objects v3cancel